Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Require conversation resolution before merging" to branch protection documentation #57

Merged
merged 3 commits into from
Aug 25, 2021

Conversation

dav3r
Copy link
Member

@dav3r dav3r commented Aug 24, 2021

🗣 Description

This PR adds the "Require conversation resolution before merging" checkbox to our standard branch protection setup. It also adds a blurb about disabling squash merges. While I was here, I also cleaned up some indentation to match the indentation displayed on the branch protection page in the GitHub web GUI.

💭 Motivation and context

We want to ensure that our PRs are not merged before all conversations have been properly resolved.

🧪 Testing

Visual verification of Markdown changes.

✅ Checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • All new and existing tests pass.

Also, clean up some indentation to match the indentation displayed on the branch protection page in the GitHub web GUI.
@dav3r dav3r added the documentation This issue or pull request improves or adds to documentation label Aug 24, 2021
@dav3r dav3r self-assigned this Aug 24, 2021
@jsf9k
Copy link
Member

jsf9k commented Aug 24, 2021

We should also add some jazz for disabling squash commits, which I suppose should go in a different Markdown file since that option is under the general settings instead of the branch protection settings. @dav3r, are you OK if I slip that into this PR?

@dav3r
Copy link
Member Author

dav3r commented Aug 24, 2021

We should also add some jazz for disabling squash commits, which I suppose should go in a different Markdown file since that option is under the general settings instead of the branch protection settings. @dav3r, are you OK if I slip that into this PR?

Sure, go for it!

Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me! Thanks for updating this documentation.

project_setup/branch-protection.md Show resolved Hide resolved
@dav3r dav3r merged commit d15d444 into develop Aug 25, 2021
@dav3r dav3r deleted the documentation/require_conversation_resolution branch August 25, 2021 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation This issue or pull request improves or adds to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants